diff --git a/WickedEngine/MainComponent.cpp b/WickedEngine/MainComponent.cpp
index c4b5184a8..9752c8a65 100644
--- a/WickedEngine/MainComponent.cpp
+++ b/WickedEngine/MainComponent.cpp
@@ -123,6 +123,8 @@ void MainComponent::Run()
 	wiProfiler::GetInstance().BeginFrame();
 	wiProfiler::GetInstance().BeginRange("CPU Frame", wiProfiler::DOMAIN_CPU);
 
+	wiInputManager::GetInstance()->Update();
+
 	static wiTimer timer = wiTimer();
 	static double accumulator = 0.0;
 	const double elapsedTime = max(0, timer.elapsed() / 1000.0);
diff --git a/WickedEngine/wiInputManager.cpp b/WickedEngine/wiInputManager.cpp
index 522836b0f..5334d7caa 100644
--- a/WickedEngine/wiInputManager.cpp
+++ b/WickedEngine/wiInputManager.cpp
@@ -22,16 +22,6 @@ wiInputManager::wiInputManager()
 	xinput = nullptr;
 	dinput = nullptr;
 	rawinput = nullptr;
-	
-	thread([&] {
-
-		while (true)
-		{
-			Update();
-			wiHelper::Sleep(16.f);
-		}
-
-	}).detach();
 }
 wiInputManager::~wiInputManager()
 {
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index b8423ccab..908d461a7 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates
 	const int minor = 21;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 7;
+	const int revision = 8;
 
 
 	long GetVersion()