[master] Optical flow fixed