fix: use payload instead of id (#439)

fix: use payload instead of id (#439) #403