Hotfix for #351