diff --git a/common/core/src/ux_device_stack_control_request_process.c b/common/core/src/ux_device_stack_control_request_process.c
index 013c3452..6f6010b0 100644
--- a/common/core/src/ux_device_stack_control_request_process.c
+++ b/common/core/src/ux_device_stack_control_request_process.c
@@ -111,8 +111,8 @@ ULONG                       application_data_length;
 
         /* Filter for GET_DESCRIPTOR/SET_DESCRIPTOR commands. If the descriptor to be returned is not a standard descriptor,
            treat the command as a CLASS command.  */
-        if ((request == UX_GET_DESCRIPTOR || request == UX_SET_DESCRIPTOR) && (((request_value >> 8) & UX_REQUEST_TYPE) != UX_REQUEST_TYPE_STANDARD))
-        {
+        if ((request == UX_GET_DESCRIPTOR || request == UX_SET_DESCRIPTOR) && ((request_type & UX_REQUEST_TYPE) != UX_REQUEST_TYPE_STANDARD))
+        {        
 
             /* This request is to be handled by the class layer.  */
             request_type &=  (UINT)~UX_REQUEST_TYPE;