STARS-565_fix

STARS-565_fix