Fix for HER-2074
https://webarchive.jira.com/browse/HER-2074
Merge pull request #97 from kris-sigur/HER-2074

Fix for HER-2074