critical change to dispatcher