Hotfix of #33