fix parsing commands