diff --git a/src/Surfaces/BaseSurface.h b/src/Surfaces/BaseSurface.h
index 8fc96dd..f7d8c0c 100644
--- a/src/Surfaces/BaseSurface.h
+++ b/src/Surfaces/BaseSurface.h
@@ -43,7 +43,7 @@ class BaseSurface {
 	
 		// TODO: The surface should emit an event once vertex has changed
 		ofEvent <vector<ofVec3f>> verticesChangedEvent;
-		ofEvent <ofVec3f> vertexChangedEvent;
+		ofEvent <int> vertexChangedEvent;
 
 	protected:
 		ofMesh mesh;
diff --git a/src/Surfaces/GridWarpSurface.cpp b/src/Surfaces/GridWarpSurface.cpp
index 636ebaa..16be445 100644
--- a/src/Surfaces/GridWarpSurface.cpp
+++ b/src/Surfaces/GridWarpSurface.cpp
@@ -145,7 +145,7 @@ void GridWarpSurface::setVertex(int index, ofVec2f p){
 	
 	mesh.setVertex(index, p);
 	ofVec3f v = mesh.getVertex(index);
-	ofNotifyEvent(vertexChangedEvent, v, this);
+	ofNotifyEvent(vertexChangedEvent, index, this);
 }
 
 void GridWarpSurface::setVertices(vector<ofVec2f> v){
diff --git a/src/Surfaces/QuadSurface.cpp b/src/Surfaces/QuadSurface.cpp
index b88f0dc..561278d 100644
--- a/src/Surfaces/QuadSurface.cpp
+++ b/src/Surfaces/QuadSurface.cpp
@@ -97,7 +97,7 @@ void QuadSurface::setVertex(int index, ofVec2f p){
 
 	mesh.setVertex(index, p);
 	ofVec3f v = mesh.getVertex(index);
-	ofNotifyEvent(vertexChangedEvent, v, this);
+	ofNotifyEvent(vertexChangedEvent, index, this);
 }
 
 void QuadSurface::setVertices(vector<ofVec2f> v){
diff --git a/src/Surfaces/SurfaceStack.cpp b/src/Surfaces/SurfaceStack.cpp
index b3c3c7c..900089a 100644
--- a/src/Surfaces/SurfaceStack.cpp
+++ b/src/Surfaces/SurfaceStack.cpp
@@ -52,8 +52,8 @@ void SurfaceStack::onVerticesChanged(vector<ofVec3f> & vertices){
 	ofNotifyEvent(verticesChangedEvent, vertices, this);
 }
 
-void SurfaceStack::onVertexChanged(ofVec3f & vertex){
-	ofNotifyEvent(vertexChangedEvent, vertex, this);
+void SurfaceStack::onVertexChanged(int & i){
+	ofNotifyEvent(vertexChangedEvent, i, this);
 }
 
 } // namespace piMapper
diff --git a/src/Surfaces/SurfaceStack.h b/src/Surfaces/SurfaceStack.h
index 950a48e..ad7a2ff 100644
--- a/src/Surfaces/SurfaceStack.h
+++ b/src/Surfaces/SurfaceStack.h
@@ -23,10 +23,10 @@ class SurfaceStack {
 		BaseSurface * back();
 	
 		ofEvent <vector<ofVec3f>> verticesChangedEvent;
-		ofEvent <ofVec3f> vertexChangedEvent;
+		ofEvent <int> vertexChangedEvent;
 	
 		void onVerticesChanged(vector<ofVec3f> & vertices);
-		void onVertexChanged(ofVec3f & vertex);
+		void onVertexChanged(int & i);
 	
 	private:
 		vector<BaseSurface *> _surfaces;
diff --git a/src/Surfaces/TriangleSurface.cpp b/src/Surfaces/TriangleSurface.cpp
index d54518f..0ade7a8 100644
--- a/src/Surfaces/TriangleSurface.cpp
+++ b/src/Surfaces/TriangleSurface.cpp
@@ -64,7 +64,7 @@ void TriangleSurface::setVertex(int index, ofVec2f p){
 	
 	mesh.setVertex(index, p);
 	ofVec3f v = mesh.getVertex(index);
-	ofNotifyEvent(vertexChangedEvent, v, this);
+	ofNotifyEvent(vertexChangedEvent, index, this);
 }
 
 void TriangleSurface::setVertices(vector<ofVec2f> v){