TEIIDDES-1575 Additional fix for missing changes to previous commit