adapt to new patch place and changed logic of rewinding option