Fixes commander invocation