Fix the new command pattern