Fixed pre-dispatch for commands that override message