Unicode fix by Alexander Plavin