Added Unicode fix