#COP-67 fixed