Fix logic for dispatch support.