hotfix for issue #115