Update for upstream change