diff --git a/firmware/app/tasks/system_reset.c b/firmware/app/tasks/system_reset.c
index de995997..2d6ab484 100644
--- a/firmware/app/tasks/system_reset.c
+++ b/firmware/app/tasks/system_reset.c
@@ -25,7 +25,7 @@
  * 
  * \author Gabriel Mariano Marcelino <gabriel.mm8@gmail.com>
  * 
- * \version 0.10.7
+ * \version 0.10.16
  * 
  * \date 2020/01/12
  * 
@@ -42,9 +42,11 @@ xTaskHandle xTaskSystemResetHandle;
 
 void vTaskSystemReset(void)
 {
+    TickType_t reset_period_ticks = pdMS_TO_TICKS_64((TickType_t) TASK_SYSTEM_RESET_PERIOD_MS);
+
     while(1)
     {
-        vTaskDelay(pdMS_TO_TICKS_64(TASK_SYSTEM_RESET_PERIOD_MS));
+        vTaskDelay(reset_period_ticks); 
 
         sys_log_print_event_from_module(SYS_LOG_INFO, TASK_SYSTEM_RESET_NAME, "Restarting the system...");
         sys_log_new_line();
diff --git a/firmware/app/tasks/system_reset.h b/firmware/app/tasks/system_reset.h
index cf9b6651..2dec9812 100644
--- a/firmware/app/tasks/system_reset.h
+++ b/firmware/app/tasks/system_reset.h
@@ -25,7 +25,7 @@
  * 
  * \author Gabriel Mariano Marcelino <gabriel.mm8@gmail.com>
  * 
- * \version 0.10.7
+ * \version 0.10.16
  * 
  * \date 2020/01/12
  * 
@@ -45,7 +45,7 @@
 #define TASK_SYSTEM_RESET_PRIORITY                  2                       /**< Task priority. */
 #define TASK_SYSTEM_RESET_PERIOD_MS                 (1000UL*60U*60U*10U)    /**< Task period in milliseconds. */
 
-#define pdMS_TO_TICKS_64( xTimeInMs ) ( ( TickType_t ) ( ( ( TickType_t ) ( xTimeInMs ) * ( TickType_t ) configTICK_RATE_HZ ) / ( TickType_t ) 1000 ) )
+#define pdMS_TO_TICKS_64( xTimeInMs ) ( ( TickType_t ) ( ( ( uint64_t ) ( xTimeInMs ) * ( uint64_t ) configTICK_RATE_HZ ) / ( TickType_t ) 1000 ) )
 
 /**
  * \brief Periodic system reset handle.
diff --git a/firmware/version.h b/firmware/version.h
index d3890bc4..0b4148d1 100644
--- a/firmware/version.h
+++ b/firmware/version.h
@@ -25,7 +25,7 @@
  * 
  * \author Gabriel Mariano Marcelino <gabriel.mm8@gmail.com>
  * 
- * \version 0.10.14
+ * \version 0.10.16
  * 
  * \date 2019/10/25
  * 
@@ -36,7 +36,7 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#define FIRMWARE_VERSION            "0.10.14"
+#define FIRMWARE_VERSION            "0.10.16"
 
 #define FIRMWARE_STATUS             "Development"