Another locale improvement for #4