--- mcore-src/trunk/mcore-tools/src/modules/basic-input/input.client.class.in	2014/01/10 14:44:20	2197
+++ mcore-src/trunk/mcore-tools/src/modules/basic-input/input.client.class.in	2014/01/14 10:34:57	2269
@@ -22,7 +22,7 @@
 # set_input_keyboard
 set_input_keyboard()
 {
-	local value="$1"
+	local value="${CLASS_ARGV[0]}"
 	local rate
 	local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart/keyboard"
 
@@ -62,7 +62,7 @@
 # set_input_keyboard
 set_input_keymap()
 {
-	local value="$1"
+	local value="${CLASS_ARGV[0]}"
 	local CONFIG
 
 	[[ -z ${value} ]] && help_input_keymap && return 1