diff --git a/gui/keyboard.cpp b/gui/keyboard.cpp
index a41cba2..6595d8d 100644
--- a/gui/keyboard.cpp
+++ b/gui/keyboard.cpp
@@ -323,7 +323,7 @@
 
 int GUIKeyboard::GetSelection(int x, int y)
 {
-	if (x < mRenderX || x - mRenderX > mRenderW || y < mRenderY || y - mRenderY > mRenderH) return -1;
+	if (x < mRenderX || x - mRenderX > KeyboardWidth || y < mRenderY || y - mRenderY > KeyboardHeight) return -1;
 	return 0;
 }
 
@@ -368,10 +368,10 @@
 	case TOUCH_DRAG:
 		break;
 	case TOUCH_RELEASE:
-		if (x < startX - (mRenderW * 0.5)) {
+		if (x < startX - (KeyboardWidth * 0.5)) {
 			PageManager::NotifyKeyboard(KEYBOARD_SWIPE_LEFT);
 			return 0;
-		} else if (x > startX + (mRenderW * 0.5)) {
+		} else if (x > startX + (KeyboardWidth * 0.5)) {
 			PageManager::NotifyKeyboard(KEYBOARD_SWIPE_RIGHT);
 			return 0;
 		}
diff --git a/variables.h b/variables.h
index e6c28b7..ba69e0b 100644
--- a/variables.h
+++ b/variables.h
@@ -17,7 +17,7 @@
 #ifndef _VARIABLES_HEADER_
 #define _VARIABLES_HEADER_
 
-#define TW_VERSION_STR              "2.3.1.0"
+#define TW_VERSION_STR              "2.3.1.1"
 
 #define TW_USE_COMPRESSION_VAR      "tw_use_compression"
 #define TW_IGNORE_IMAGE_SIZE        "tw_ignore_image_size"