hotfix for #140 and #151