#COP-48 fixed