Additional data cannot be forwarded from receiver to sender correctly

Signed-off-by: Manson Li <manson.li@matchstick.tv>