Bug fixing on locale context