#COP-174 fixed. problem with formatting is another issue