diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index ef6e4fa0..f89230b3 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -3,8 +3,6 @@
 #include <fsfw/events/EventManager.h>
 #include <fsfw/ipc/QueueFactory.h>
 
-#include <algorithm>
-
 #include "OBSWConfig.h"
 #include "OBSWVersion.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
@@ -18,7 +16,7 @@
 #endif
 #include <fcntl.h>
 #include <unistd.h>
-
+#include <algorithm>
 #include <filesystem>
 
 #include "bsp_q7s/memory/SdCardManager.h"
diff --git a/linux/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
index 22f3affd..4dbb8f9c 100644
--- a/linux/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -190,7 +190,7 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
   } else {
     timeIsConstantCounter = 0;
   }
-  if (timeInit) {
+  if (timeInit and validFix) {
     if (not utility::timeSanityCheck()) {
       sif::info << "Setting init clock in gps ctrl" << std::endl;
       // For some reason, the clock needs to be somewhat correct for NTP to work. Really dumb..