Fix rewind bug