hotfix for #67