Fixed and issue with locale settings vs setup

Fixed and issue with locale settings vs setup