Fixing using default locale correctly