#1801: #1774: second sweep

opened by thuchacz