hotfix for #890