Added if Block to check only for UTF-8