Hotfix for #550