diff --git a/res/values/strings.xml b/res/values/strings.xml
index 99c29b14..c36fb0b6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 	<string translatable="false" name="help_url">https://github.com/Clam-/TraditionalT9/wiki/Traditional-T9-keypad-IME-for-Android</string>
 	<string name="app_name">Traditional T9</string>
 	<string name="ime_name">Traditional T9</string>
@@ -76,6 +76,7 @@
 	<string name="pref_keyRemap" translatable="false">Translate keys</string>
 	<string name="pref_keyRemapSum" translatable="false">Enable to send translated keys to apps, otherwise keymap is for IME only.</string>
 	<string name="pref_spaceOnZero" translatable="false">Space on 0 key</string>
+	<string name="pref_spaceOnZeroSum" tools:ignore="MissingTranslation">Map space to 0 key if checked, otherwise to # key.</string>
 
 	<string name="hello_world">Hello world!</string>
 
diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index 7a767895..5d1064c4 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -18,7 +18,7 @@
 	<SettingCheck
 		id="pref_spaceOnZero"
 		title="@string/pref_spaceOnZero"
-		summary="@string/pref_keyRemapSum"
+		summary="@string/pref_spaceOnZeroSum"
 		defaultValue="false"
 		/>
 	<SettingCheck
diff --git a/src/org/nyanya/android/traditionalt9/TraditionalT9.java b/src/org/nyanya/android/traditionalt9/TraditionalT9.java
index 0f750bbc..428c7934 100644
--- a/src/org/nyanya/android/traditionalt9/TraditionalT9.java
+++ b/src/org/nyanya/android/traditionalt9/TraditionalT9.java
@@ -604,7 +604,7 @@ public class TraditionalT9 extends InputMethodService implements
 		}
 
 		if (!onKeyDown_(keyCode, event)) {
-			if (key == null || keyRemap) {
+			if (key == null || !keyRemap) {
 				return false;
 			}
 			else {
@@ -795,7 +795,7 @@ public class TraditionalT9 extends InputMethodService implements
 		}
 
 		if (!onKeyUp_(keyCode, event)) {
-			if (key == null || keyRemap) {
+			if (key == null || !keyRemap) {
 				return false;
 			}
 			else {