Fixed infinite loop with new gen info code