NXP-13826: another try at fixing command parsing