Fix in CoreVideoPlus