Fix bug with unexpected command