Ensure first command has events wired up