Yielding bug fix.