Fix zway command refactor issue