better collision resolution