Hotfix for #429
Hotfix for #429