little upstream tweak