Hack together a fix for #447