Redid https://code.google.com/p/pato/source/detail?r=88
Which fixes svn issue 7