Fix for locale setup