#COP-66 fixed