Fixing slow generators #158