fix locale issue
fix count issue