ROBE-196 fixed