Fixing OpticalFlow to use new Sample