Locale problem solving
Signed-off-by: zhengruiw02 <zhengruiw02@gmail.com>