DE22957 fix

This is a pull request to fix https://rally1.rallydev.com/#/11744709050d/detail/defect/13437548149