#30 - Improved control for UTF8 chars