#COP-52 fixed