#COP-106 fixed