Fix issue with always default locale