Gamehandler fix