Fix to downstream code