Fix a problem with UTF8 encoding

Change-Id: I85d9c64b18944bae58ca9c4b78a7c1777270d8c8
Signed-off-by: Denis Knoepfle <denis.knoepfle@sap.com>