Fixed default locale issue