diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp
index 48009a1e..f92d5f9f 100755
--- a/firmware/baseband/main.cpp
+++ b/firmware/baseband/main.cpp
@@ -715,6 +715,11 @@ public:
 		is_running = false;
 	}
 
+private:
+	MessageHandlerMap message_map;
+
+	bool is_running = true;
+
 	eventmask_t wait() {
 		return chEvtWaitAny(ALL_EVENTS);
 	}
@@ -729,11 +734,6 @@ public:
 		}
 	}
 
-private:
-	MessageHandlerMap message_map;
-
-	bool is_running = true;
-
 	void handle_baseband_queue() {
 		while( !shared_memory.baseband_queue.is_empty() ) {
 			std::array<uint8_t, Message::MAX_SIZE> message_buffer;