FIXED handling of true UTF-8 files