Fixed save action creating duplicates