Fix the en-US locale handler, work with both US and CA locale now