Mesh fix (7/20)

Mesh fix