make the fix for intermittent bulls a bit more efficient