PCBC-219 fix bug