diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index 6c74c01e1..5c8056c9b 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -2072,8 +2072,6 @@ class Server{
 				}
 			}
 
-			TimingsHandler::tick();
-
 			$this->tickMeasure = (($time = microtime(true)) - $this->tickTime);
 			$this->tickTime = $time;
 			$this->nextTick = 0.05 * (0.05 / max(0.05, $this->tickMeasure)) + $time;
@@ -2081,6 +2079,8 @@ class Server{
 
 			Timings::$serverTickTimer->stopTiming();
 
+			TimingsHandler::tick();
+
 			return true;
 		}
 
diff --git a/src/pocketmine/event/TimingsHandler.php b/src/pocketmine/event/TimingsHandler.php
index fe047c2a0..6039e0cc2 100644
--- a/src/pocketmine/event/TimingsHandler.php
+++ b/src/pocketmine/event/TimingsHandler.php
@@ -46,7 +46,7 @@ class TimingsHandler{
 	 * @param string         $name
 	 * @param TimingsHandler $parent
 	 */
-	public function __construct($name, $parent = null){
+	public function __construct($name, TimingsHandler $parent = null){
 		$this->name = $name;
 		if($parent instanceof TimingsHandler){
 			$this->parent = $parent;