Reflect upstream bug fix