Hotfix to issue #40