Fix to accept double-byte characters