hotfix for #748-fix