Fix validation preventing editing and saving an issue