Fix Command initialization