Fix for false positive validation errors when editing