#COP-65 fixed