Reformated rewrite xml part - can't say why but apparently this fixes bug #2624
Merge pull request #396 from hoerup/master

Fix for bug #2624