fix yield operation