fixed for locale selector