#COP-69 fixed