Change dispatch logic slightly