diff --git a/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp b/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp
index eadc109..320fdfb 100644
--- a/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp
+++ b/openVulkanoCpp/Host/GLFW/InputMappingGLFW.hpp
@@ -48,7 +48,7 @@ namespace OpenVulkano::GLFW
 				{
 					remappedKey = i - 320;
 				}
-				else if (i >= GLFW_KEY_NUM_LOCK)
+				else if (i == GLFW_KEY_NUM_LOCK)
 				{
 					remappedKey = 17;
 				}
diff --git a/openVulkanoCpp/Input/InputManager.cpp b/openVulkanoCpp/Input/InputManager.cpp
index b17ca6a..5e36010 100644
--- a/openVulkanoCpp/Input/InputManager.cpp
+++ b/openVulkanoCpp/Input/InputManager.cpp
@@ -69,7 +69,7 @@ namespace OpenVulkano::Input
 			for (const KeyBinding binding : action->GetKeys())
 			{
 				if (binding.key.GetInputDeviceType() != device->GetType()) continue;
-				if (device->GetButton(binding.key)) return true;
+				return device->GetButton(binding.key); 
 			}
 		}
 		return false;
@@ -80,7 +80,7 @@ namespace OpenVulkano::Input
 		for(const InputDevice* device : devices)
 		{
 			if (key.GetInputDeviceType() != device->GetType()) continue;
-			if (device->GetButton(key)) return true;
+			return device->GetButton(key); 
 		}
 		return false;
 	}