Fix regression with some commands.