Fix for error when running the patch a second time and attempting to add a field again.