Fixed CollisionManager