#920: #889: another tweak

opened by thuchacz