LD-109 prevent loss of data during save to db