Fixed double save causing deletion of data.