rework the rewinding logic once again, fixing