#COP-123 fixed
deprecated code