diff --git a/src/main/java/com/simsilica/lemur/event/TouchAppState.java b/src/main/java/com/simsilica/lemur/event/TouchAppState.java
index 4a2dc882..2bd99c47 100644
--- a/src/main/java/com/simsilica/lemur/event/TouchAppState.java
+++ b/src/main/java/com/simsilica/lemur/event/TouchAppState.java
@@ -179,29 +179,22 @@ public void onTouchEvent(TouchEvent te) {
             }
             PointerData pointerData;
             switch (te.getType()) {
-                case DOWN:
-                    pointerData = getPointerData(
-                            te.getPointerId(), (int)te.getX(), (int)te.getY());
-                    if (dispatchButton(pointerData, true)) {
-                        te.setConsumed();
-                    }
-                    break;
-                case MOVE:
+                case TAP:
                     pointerData = pointerDataMap.get(te.getPointerId());
                     if (pointerData != null) {
                         pointerData.lastX = (int)te.getX();
                         pointerData.lastY = (int)te.getY();
+                        if (dispatchButton(pointerData, false)) {
+                            te.setConsumed();
+                        }
+                        pointerDataMap.remove(te.getPointerId());
                     }
                     break;
-                case UP:
+                case MOVE:
                     pointerData = pointerDataMap.get(te.getPointerId());
                     if (pointerData != null) {
                         pointerData.lastX = (int)te.getX();
                         pointerData.lastY = (int)te.getY();
-                        if (dispatchButton(pointerData, false)) {
-                            te.setConsumed();
-                        }
-                        pointerDataMap.remove(te.getPointerId());
                     }
                     break;
                 default: