CMOSD-497 fix bug