\r
 bool Pipe_IsEndpointBound(uint8_t EndpointAddress)\r
 {\r
-       uint8_t PrevPipeNumber = Pipe_GetPipeNumber();\r
+       uint8_t PrevPipeNumber = Pipe_GetCurrentPipe();\r
 \r
        for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)\r
        {\r
                Pipe_SelectPipe(PNum);\r
                \r
-               if (Pipe_IsConfigured() && (Pipe_BoundEndpointAddress() == EndpointAddress))\r
+               if (Pipe_IsConfigured() && (Pipe_BoundEndpointNumber() == EndpointAddress))\r
                  return true;\r
        }\r
        \r