Fix to work with descriptor version of Robin DataDriven trigger