#COP-71 fixed