Fix issue with generator output