Fixed an issue with what was being returned - list instead of the generator that was there