reapply changes concerning fallback in case of incorrect UTF-8 data