Collision and loosing bugs fix