Fixed too long without yielding