upstream bug #71