Fix time until end of round is detected being too long (MO-231)