Fixed fast forward behaviour