fixed fast-forward bug