Collision detector has been re-written and now handles edge cases
properly.