Fixed: graph generation