diff --git a/Demos/Host/KeyboardHost/ConfigDescriptor.c b/Demos/Host/KeyboardHost/ConfigDescriptor.c
index 7cbf9484ba..0b475bfaa0 100644
--- a/Demos/Host/KeyboardHost/ConfigDescriptor.c
+++ b/Demos/Host/KeyboardHost/ConfigDescriptor.c
@@ -117,13 +117,13 @@ DESCRIPTOR_COMPARATOR(NextKeyboardInterface)
 	{
 		/* Check the HID descriptor class and protocol, break out if correct class/protocol interface found */
 		if ((DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Class    == KEYBOARD_CLASS) &&
-		    (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Subclass == KEYBOARD_SUBCLASS))
+		    (DESCRIPTOR_CAST(CurrentDescriptor, USB_Descriptor_Interface_t).Protocol == KEYBOARD_PROTOCOL))
 		{
 			return DESCRIPTOR_SEARCH_Found;
 		}
 	}
 	
-	return Descriptor_Search_NotFound;
+	return DESCRIPTOR_SEARCH_NotFound;
 }
 
 /** Descriptor comparator function. This comparator function is can be called while processing an attached USB device's
diff --git a/Demos/Host/makefile b/Demos/Host/makefile
index 2bf8adb7a8..82661fffca 100644
--- a/Demos/Host/makefile
+++ b/Demos/Host/makefile
@@ -21,7 +21,7 @@ all:
 	make -C GenericHIDHost all	
 
 	make -C KeyboardHost clean
-	make -C KeyboardHostWithParser all	
+	make -C KeyboardHost all	
 
 	make -C MassStorageHost clean
 	make -C MassStorageHost all