diff --git a/lib/nodes/CMakeLists.txt b/lib/nodes/CMakeLists.txt
index 560517ed6..13fa3743f 100644
--- a/lib/nodes/CMakeLists.txt
+++ b/lib/nodes/CMakeLists.txt
@@ -22,6 +22,7 @@
 
 set(NODE_SRC
     influxdb.c
+# @todo: Port to C++
 #    stats.c
     signal_generator.c    
     loopback.c
diff --git a/lib/nodes/signal_generator.c b/lib/nodes/signal_generator.c
index 099f408f6..adf444e1d 100644
--- a/lib/nodes/signal_generator.c
+++ b/lib/nodes/signal_generator.c
@@ -266,7 +266,7 @@ int signal_generator_read(struct node *n, struct sample *smps[], unsigned cnt, u
 	if (s->limit > 0 && s->counter >= s->limit) {
 		info("Reached limit of node %s", node_name(n));
 		killme(SIGTERM);
-		pause();
+		return 0;
 	}
 
 	s->counter += steps;