merged play-again-fix's tmp fix