#1814: #1786: fix

opened by thuchacz