Fix bug when no commands