fix a parsing error and add some modification to support current Nightly (when it...