diff --git a/project/java/Video.java b/project/java/Video.java
index 937b5250e..22f9faf3f 100644
--- a/project/java/Video.java
+++ b/project/java/Video.java
@@ -109,7 +109,11 @@ abstract class DifferentTouchInput
 		}
 		try {
 			if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH && IcsTouchInput.Holder.sInstance != null )
+			{
+				if(android.os.Build.MODEL.equals("GT-N7000") || android.os.Build.MODEL.equals("SGH-I717"))
+					return GalaxyNoteIcsTouchInput.Holder.sInstance;
 				return IcsTouchInput.Holder.sInstance;
+			}
 			if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD && XperiaPlayTouchpadTouchInput.Holder.sInstance != null )
 				return XperiaPlayTouchpadTouchInput.Holder.sInstance;
 			if (multiTouchAvailable1 && multiTouchAvailable2)
@@ -406,6 +410,20 @@ abstract class DifferentTouchInput
 			}
 		}
 	}
+	private static class GalaxyNoteIcsTouchInput extends IcsTouchInput
+	{
+		private static class Holder
+		{
+			private static final GalaxyNoteIcsTouchInput sInstance = new GalaxyNoteIcsTouchInput();
+		}
+		public void process(final MotionEvent event)
+		{
+			// HACK for Galaxy Note stylus, which pushes the cursor to the lower-right part of the screen, when you lift the stylus.
+			// Also it reports the stylus as the mouse
+			if(! (event.getSource() == InputDevice.SOURCE_MOUSE && (int)event.getX() == 0 && (int)event.getY() == 799))
+				super.process(event);
+		}
+	}
 }
 
 
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index ec521b7b5..b7f4935c4 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit ec521b7b51463c171c2d3cf84123700d6e55451f
+Subproject commit b7f4935c468c20999dd1aaf95c493ad9c722979d