OC-5990
commiting more fix to this issue