Seem to have fixed collision detection