Another collision fix