Fix yielding