\r
                if (Endpoint_IsINReady())\r
                {\r
-                       while (Length && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
+                       uint16_t BytesInEndpoint = Endpoint_BytesInEndpoint();\r
+               \r
+                       while (Length && (BytesInEndpoint < USB_ControlEndpointSize))\r
                        {\r
                                TEMPLATE_TRANSFER_BYTE(DataStream);\r
                                Length--;\r
+                               BytesInEndpoint++;\r
                        }\r
                        \r
-                       LastPacketFull = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
+                       LastPacketFull = (BytesInEndpoint == USB_ControlEndpointSize);\r
                        Endpoint_ClearIN();\r
                }\r
        }\r