Fix for bug 1979 (new round)

[ci skip]