Changed calculation of request id