Properly fix the default locale issue