Fix MO-234: leaving the game takes too much time