fixed collision checks