fix shitty behavior introduced by ping pong