fast forward bug fix