hotfix for issue #95