fix collision