Hotfix for issue #62.