HCOLL-155 fixed bug around lock type