Fixed bug with default locale