Fix an issue with the handling of commands