Fix default command - part 2