Fix pi request forwarding problem