#COP-41 fixed