OC-5983
checking fix code