Fix breakage at the end of long rounds
Merge remote-tracking branch 'origin/master'