Fixed hard-coded too long without yielding