Fix issue with default createCallback when multiple commands are run