Fixed different language handling for slave