Fixed double save