Fix parse commands tool