[FIX] Collision detection