Fixed unexpected save on duplicate