Patches

Another Try !

Also fixes #1826