fixed collision resolution