preparing
#COP-140 fixed