Various fixes

What if the issue with the usage of `\S` ?
Could you please create a unit test to prove it and prevent regression ?