diff --git a/hangman.c b/hangman.c
index 881d522..2f3756f 100644
--- a/hangman.c
+++ b/hangman.c
@@ -104,12 +104,11 @@ void startGame(game_state *gs, hitfeed *hf) {
     time(&gs->startTime);
     while (checkWin(gs)) {
         updateScreen(gs);
-        printHitFeed(gs, hf);
         playerInput(gs, hf);
+        printHitFeed(gs, hf);
     }
 }
 
-
 void quitProgram(void) {
     endwin();
 }
@@ -456,9 +455,12 @@ void printHitFeed(game_state *gs, hitfeed *hf) {
             mvprintw(newMaxy + i, newMaxx, hf->history[i]);
         }
         /* Print best score above history feed */
-        char message[100];
-        sprintf(message, "Best: %s (%i hits)", hf->beststreak, hf->besthit);
-        mvprintw(newMaxy - 1, newMaxx, message);
+        if (hf->besthit != 0) {
+          /* There is a hit. So a best score can be displayed */
+          char message[100];
+          sprintf(message, "Best: %s (%i hits)", hf->beststreak, hf->besthit);
+          mvprintw(newMaxy - 1, newMaxx, message);
+        }
     }
 }