improve DESPATCH support