diff --git a/Source/OpenTK/InputDriver.cs b/Source/OpenTK/InputDriver.cs
index d2827610..14037872 100644
--- a/Source/OpenTK/InputDriver.cs
+++ b/Source/OpenTK/InputDriver.cs
@@ -31,8 +31,7 @@ namespace OpenTK
             }
             else if (Environment.OSVersion.Platform == PlatformID.Unix)
             {
-                inputDriver = 
-                    new OpenTK.Platform.X11.X11Input(parent);
+                inputDriver = new OpenTK.Platform.X11.X11Input(parent);
             }
             else
             {
diff --git a/Source/OpenTK/Platform/X11/X11Input.cs b/Source/OpenTK/Platform/X11/X11Input.cs
index f7500bb5..04b4b537 100644
--- a/Source/OpenTK/Platform/X11/X11Input.cs
+++ b/Source/OpenTK/Platform/X11/X11Input.cs
@@ -120,11 +120,13 @@ namespace OpenTK.Platform.X11
 
         public IList<Mouse> Mouse
         {
-            get { throw new Exception("The method or operation is not implemented."); }
+            get { return mouseDriver.Mouse; }
         }
 
         #endregion
 
+        #region public void Poll()
+
         /// <summary>
         /// Consumes to keyboard, mouse, etc events, routing them to their
         /// respective drivers.
@@ -157,6 +159,8 @@ namespace OpenTK.Platform.X11
 
         #endregion
 
+        #endregion
+
         #region --- IDisposable Members ---
 
         public void Dispose()