Fix for HER-2074

https://webarchive.jira.com/browse/HER-2074