Fix for HER-2071
Merge pull request #82 from kris-sigur/HER-2071

Fix for HER-2071