Fix Command issue.