Fixed error with unicode handling