#GT-878: fixed