fix cmd parsing