HRCPP-8 fixed