Fix bug with creating new records each save