Locale fix for SF 2.3