fix nested yield