ROBE-143 fixed