Round end fix

Port of PR https://github.com/Baystation12/Baystation12/pull/5116 to master