Merge pull request #2621 from G8XSU/dont-persist-erroneous-update