dispatch and routing minor fix