ROBE-254 fixed