Fix for two byte strings