token commit to stop fast-forwarding