New version of patch

From #1650.