#1811: #1780: third sweep

opened by thuchacz