GG-9242 fix.
GG-9242 New fix from Yakov.
#
#
# sp-28 minor
Minor fix.