+ Add fix for locale