diff --git a/src/core.c b/src/core.c
index 0d91c0b33415532aa59bda5c37f3173a0515bb68..af6a6d337ff72360b0fafda057c2db6b48a36913 100644
--- a/src/core.c
+++ b/src/core.c
@@ -358,8 +358,10 @@ int mtdev_init(struct mtdev *dev)
 	dev->state = calloc(1, sizeof(struct mtdev_state));
 	if (!dev->state)
 		return -ENOMEM;
-	for (i = 0; i < DIM_FINGER; i++)
+	for (i = 0; i < DIM_FINGER; i++) {
 		dev->state->data[i].tracking_id = MT_ID_NULL;
+		dev->state->data[i].tool_type = MT_ID_NULL;
+	}
 	return 0;
 }
 
diff --git a/src/state.h b/src/state.h
index 06e86ae6e5feee5d6951578382c2f42c7ef02ba5..696b6da60bd1d25c45cedad76591a546fb8b6e68 100644
--- a/src/state.h
+++ b/src/state.h
@@ -49,6 +49,8 @@ struct mtdev_slot {
 	int tracking_id;
 	int pressure;
 	int distance;
+	int tool_x;
+	int tool_y;
 };
 
 static inline int get_sval(const struct mtdev_slot *slot, int ix)