Hotfix for #415