patch up for understream upgrade