Fix bug by port by cli