fix upstream breakage