HCOLL-66 Rafined the fix