Fix single-record saving