FIXED #019, commit UTF-16