fix collision again