hotfix for #719