DDF-953 fixed serialization issues