hotfix for [#95]