Fix for HER-2071

Fixes [HER-2071](https://webarchive.jira.com/browse/HER-2071)