Fix a(nother) bug relating to vanilla command dispatching