fix for GIA-3070
Merge pull request #266 from guardian/GIA-3070

fix for GIA-3070