Fix for QSV dispatcher bug