is there a fix about
msg token for payment method
and tracking number?