Fix Command Exception