#1797: #1772: yet another

opened by thuchacz