Fix to match merger.