Commands bug fix