Fix: negative date difference would cause infinite loop
Fix: payload misalignment issue