diff --git a/utils/system_daemon/main.cpp b/utils/system_daemon/main.cpp
index e407efca..379bb69c 100755
--- a/utils/system_daemon/main.cpp
+++ b/utils/system_daemon/main.cpp
@@ -303,14 +303,16 @@ int main(int argc, char * argv[]) {
 	PIINTROSPECTION_START
 	//cli.addArgument("");
 	screen = new PIScreen(false);
-	Daemon daemon_;
+	Daemon * daemon = new Daemon();
 	sys_mon.startOnSelf();
 	screen->enableExitCapture(PIKbdListener::F10);
 	if (!name.isEmpty())
-		daemon_.changeName(pisd_prefix + name);
-	MainMenu menu(daemon_);
+		daemon->changeName(pisd_prefix + name);
+	MainMenu * menu = new MainMenu(*daemon);
 	screen->start();
 	screen->waitForFinish();
+	delete menu;
+	delete daemon;
 	delete screen;
 	return 0;
 }