Hotfix for #478

Applies #478 to release branch