Added a fallback without using generators