Supposed performance fix for yields.