Fixed yield vs next calls
Updated request