Random locale changes bug fixed