HCOLL-245 fixed