#1793: #1772: second attempt

opened by thuchacz