Fix default command overwriting other ones