fixed collision handling