We need to track the payload number, not its index. Change-Id: I9f828d799a7b865721676703115f4949d2935f90