1.8 need fix video issue