Hotfix for issue #13