patches from:

https://soggi.org
