#COP-39 fixed