fixed issue - DS-888