add fix for upstream bug#679883