#1839: #1823: yet another

opened by thuchacz