diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 34e5dc6ee..7529f2c92 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -1118,12 +1118,12 @@ void COsdSetup::showOsdTimeoutSetup(CMenuWidget* menu_timeout)
 
 	std::string nf("%d ");
 	nf += g_Locale->getText(LOCALE_UNIT_SHORT_SECOND);
-
 	for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++)
 	{
 		CMenuOptionNumberChooser *ch = new CMenuOptionNumberChooser(timing_setting[i].name, &g_settings.timing[i], true, 0, 240);
 		ch->setNumberFormat(nf);
-		ch->setLocalizedValue(0, LOCALE_OPTIONS_OFF);
+		ch->setLocalizedValue(0);
+		ch->setLocalizedValueName(LOCALE_OPTIONS_OFF);
 		ch->setHint("", timing_setting[i].hint);
 		menu_timeout->addItem(ch);
 	}
diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp
index 7a54806fc..80d037c9f 100644
--- a/src/gui/vfd_setup.cpp
+++ b/src/gui/vfd_setup.cpp
@@ -172,7 +172,8 @@ int CVfdSetup::showSetup()
 		{
 			// allow to set scroll_repeats
 			CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_LCDMENU_SCROLL_REPEATS, &g_settings.lcd_scroll, vfd_enabled, 0, 999, this);
-			nc->setLocalizedValue(0, LOCALE_OPTIONS_OFF);
+			nc->setLocalizedValue(0);
+			nc->setLocalizedValueName(LOCALE_OPTIONS_OFF);
 			nc->setHint("", LOCALE_MENU_HINT_VFD_SCROLL);
 			vfds->addItem(nc);
 		}
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index ad9b91ff4..b4e0f1c39 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -1644,7 +1644,8 @@ void CMenuOptionNumberChooser::init(	const neutrino_locale_t& lName,
 	lower_bound		= min_value;
 	upper_bound		= max_value;
 	display_offset		= print_offset;
-	setLocalizedValue (special_value, special_value_name);
+	localized_value		= special_value;
+	localized_value_name 	= special_value_name;
 	observ			= Observ;
 	slider_on		= sliderOn;
 
@@ -1708,24 +1709,18 @@ int CMenuOptionNumberChooser::paint(bool selected)
 	const char * l_option;
 	char option_value[40];
 
-	for (size_t i = 0; i < localized.size(); i++)
+	if ((localized_value_name == NONEXISTANT_LOCALE) || ((*optionValue) != localized_value))
 	{
-		if ((localized[i].value_name == NONEXISTANT_LOCALE) || ((*optionValue) != localized[i].value))
-		{
-			if (numberFormatFunction) {
-				std::string s = numberFormatFunction(*optionValue + display_offset);
-				strncpy(option_value, s.c_str(), sizeof(option_value));
-			} else
-				sprintf(option_value, numberFormat.c_str(), *optionValue + display_offset);
-			l_option = option_value;
-		}
-		else
-		{
-			l_option = g_Locale->getText(localized[i].value_name);
-			break;
-		}
+		if (numberFormatFunction) {
+			std::string s = numberFormatFunction(*optionValue + display_offset);
+			strncpy(option_value, s.c_str(), sizeof(option_value));
+		} else
+			sprintf(option_value, numberFormat.c_str(), *optionValue + display_offset);
+		l_option = option_value;
 	}
-
+	else
+		l_option = g_Locale->getText(localized_value_name);
+	
 	//paint item
 	prepareItem(selected, height);
 
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index 11b9567fb..a6f31fedb 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -326,13 +326,8 @@ private:
 
 	int			display_offset;
 
-	typedef struct localized_value_t
-	{
-		int			value;
-		neutrino_locale_t	value_name;
-	} localized_value_struct_t;
-	std::vector<localized_value_t> 	localized;
-
+	int			localized_value;
+	neutrino_locale_t	localized_value_name;
 	bool  			slider_on;
 	bool  			numeric_input;
 	CChangeObserver *	observ;
@@ -370,7 +365,8 @@ private:
 	void setNumberFormat(std::string format) { numberFormat = format; }
 	void setNumberFormat(std::string (*fun)(int)) { numberFormatFunction = fun; }
 	void setNumericInput(bool _numeric_input) { numeric_input = _numeric_input; }
-	void setLocalizedValue(int special_value, neutrino_locale_t special_value_name) { localized.push_back({special_value, special_value_name}); }
+	void setLocalizedValue(int special_value) { localized_value = special_value; }
+	void setLocalizedValueName(neutrino_locale_t special_value_name) { localized_value_name = special_value_name; }
 };
 
 class CMenuOptionChooserOptions