hotfix for #71