diff --git a/src/main.c b/src/main.c
index 8ba3060..77facbc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,14 +11,10 @@ int main(void)
 
 	for (i = 1;; i++) {
 		if (i >= 99999) i = 1;
-
-		if (USART_IsDataAvailable()) {
-			while ((ch = USART_GetChar())) {
-				CMD_Parse(ch);
-			}
-		}
-
 		USART_Printf("[CORE] Fetching sensors #%05lu...\r\n", i);
+		while ((ch = USART_GetChar())) {
+			CMD_Parse(ch);
+		}
 
 		Sleep(3000);
 	}
diff --git a/src/serial.c b/src/serial.c
index 00214c5..bc78f0a 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -34,7 +34,7 @@ char USART_GetChar(void)
 {
 	unsigned char newtail;
 
-	if (rxhead == rxtail) {
+	if (!USART_IsDataAvailable()) {
 		return '\0'; // Non-blocking
 	}