improving repeated collision handling