Fix and issue with editing creating new ones