fix yield'ing flow