TEIIDDES-1575 Additional fix for missing changes to previous commit
Merge pull request #126 from mdrillin/TDES-1575-3

TEIIDDES-1575 Additional fix for missing changes to previous commit