Hotfix for #60