Improved (though not great) handling of transient replies