Fix collisions for convex shapes