#1805: #1777: second pass

opened by thuchacz