Additional UTF-8 fix