#COP-80 fixed