WIP: hack together a fix for #447