more collision fix