Fixed request_id implementation