Crap... I forgot the fix for non-ascii chars...

Include fix from Fabian for non-ascii chars bug...