This looks like upstream bug?