Fix problem of average yield