Fixed data update after save