nast fixed upstream