Attempt to fix fast-forward