HOTFIX: closes #4