Fix: This time remember the payload