diff --git a/Assets/Plugins/Cryville.Input.Unity.Builtin/UnityGuiInputHandler.cs b/Assets/Plugins/Cryville.Input.Unity.Builtin/UnityGuiInputHandler.cs
index 1674001..ce4fdc1 100644
--- a/Assets/Plugins/Cryville.Input.Unity.Builtin/UnityGuiInputHandler.cs
+++ b/Assets/Plugins/Cryville.Input.Unity.Builtin/UnityGuiInputHandler.cs
@@ -97,11 +97,7 @@ namespace Cryville.Input.Unity {
 			useGUILayout = false;
 		}
 		void Update() {
-			double time = Time.realtimeSinceStartupAsDouble;
-			foreach (var k in ActiveKeys) {
-				Feed(k, 0, new InputFrame(time, new InputVector()));
-			}
-			Batch(time);
+			Batch(Time.realtimeSinceStartupAsDouble);
 		}
 	}
 
diff --git a/Assets/Plugins/Cryville.Input.Unity.Builtin/UnityTouchHandler.cs b/Assets/Plugins/Cryville.Input.Unity.Builtin/UnityTouchHandler.cs
index f3dcbe7..8ce1401 100644
--- a/Assets/Plugins/Cryville.Input.Unity.Builtin/UnityTouchHandler.cs
+++ b/Assets/Plugins/Cryville.Input.Unity.Builtin/UnityTouchHandler.cs
@@ -14,9 +14,11 @@ namespace Cryville.Input.Unity {
 		/// </summary>
 		/// <exception cref="NotSupportedException">Unity touch is not supported on the current device.</exception>
 		public UnityTouchHandler() {
+#if !UNITY_EDITOR // In the simulator, touch works but `touchSupported` returns false (by 2021.3)
 			if (!unity::Input.touchSupported) {
 				throw new NotSupportedException("Unity touch is not supported on this device");
 			}
+#endif
 		}
 
 		/// <inheritdoc />
diff --git a/Assets/Plugins/Cryville.Input.dll b/Assets/Plugins/Cryville.Input.dll
index c05a24d..80ef344 100644
Binary files a/Assets/Plugins/Cryville.Input.dll and b/Assets/Plugins/Cryville.Input.dll differ