#COP-172 fixed

need tests