diff --git a/VERSION b/VERSION
index 807ac98c..49d74494 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-B2-rc1-2-g88dad36449+1
\ No newline at end of file
+B2-rc1-3-g4580b18b04+1
\ No newline at end of file
diff --git a/client/src/config.c b/client/src/config.c
index c8d10645..8b1bba8a 100644
--- a/client/src/config.c
+++ b/client/src/config.c
@@ -175,8 +175,8 @@ static struct Option options[] =
   },
   {
     .module         = "win",
-    .name           = "fpsLimit",
-    .description    = "Frame rate limit (0 = disable - not recommended, -1 = auto detect)",
+    .name           = "fpsMinimum",
+    .description    = "Frame rate minimum (0 = disable - not recommended, -1 = auto detect)",
     .shortopt       = 'K',
     .type           = OPTION_TYPE_INT,
     .value.x_int    = -1,
@@ -382,7 +382,7 @@ bool config_load(int argc, char * argv[])
   params.borderless    = option_get_bool  ("win", "borderless"   );
   params.fullscreen    = option_get_bool  ("win", "fullScreen"   );
   params.maximize      = option_get_bool  ("win", "maximize"     );
-  params.fpsLimit      = option_get_int   ("win", "fpsLimit"     );
+  params.fpsMin        = option_get_int   ("win", "fpsMin"       );
   params.showFPS       = option_get_bool  ("win", "showFPS"      );
   params.ignoreQuit    = option_get_bool  ("win", "ignoreQuit"   );
   params.noScreensaver = option_get_bool  ("win", "noScreensaver");
diff --git a/client/src/main.c b/client/src/main.c
index 940d0f32..50d38d83 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -152,8 +152,6 @@ static int renderThread(void * unused)
 
   while(state.running)
   {
-    clock_gettime(CLOCK_REALTIME, &time);
-
     if (state.lgrResize)
     {
       if (state.lgr)
@@ -193,6 +191,7 @@ static int renderThread(void * unused)
       state.resizeDone = true;
     }
 
+    clock_gettime(CLOCK_REALTIME, &time);
     uint64_t nsec = time.tv_nsec + state.frameTime;
     if(nsec > 1e9)
     {
@@ -1301,7 +1300,7 @@ static int lg_run()
   updatePositionInfo();
 
   //Auto detect active monitor refresh rate for FPS Limit if no FPS Limit was passed.
-  if (params.fpsLimit == -1)
+  if (params.fpsMin == -1)
   {
       SDL_DisplayMode current;
       if (SDL_GetCurrentDisplayMode(SDL_GetWindowDisplayIndex(state.window), &current) == 0)
@@ -1310,14 +1309,14 @@ static int lg_run()
       }
       else
       {
-          DEBUG_WARN("Unable to capture monitor refresh rate using the default FPS Limit: 60");
+          DEBUG_WARN("Unable to capture monitor refresh rate using the default FPS minimum of 60");
           state.frameTime = 1e9 / 60;
       }
   }
   else
   {
-      DEBUG_INFO("Using the FPS Limit from args: %d", params.fpsLimit);
-      state.frameTime = 1e9 / params.fpsLimit;
+      DEBUG_INFO("Using the FPS minimum from args: %d", params.fpsMin);
+      state.frameTime = 1e9 / params.fpsMin;
   }
 
   register_key_binds();
diff --git a/client/src/main.h b/client/src/main.h
index de8812e1..f4d23256 100644
--- a/client/src/main.h
+++ b/client/src/main.h
@@ -109,7 +109,7 @@ struct AppParams
   bool         center;
   int          x, y;
   unsigned int w, h;
-  unsigned int fpsLimit;
+  unsigned int fpsMin;
   bool         showFPS;
   bool         useSpiceInput;
   bool         useSpiceClipboard;
@@ -151,4 +151,4 @@ struct KeybindHandle
 
 // forwards
 extern struct AppState  state;
-extern struct AppParams params;
\ No newline at end of file
+extern struct AppParams params;