fixing locale bugs