Fix Japanese Handling