#COP-167 fixed