+Partially FIXED the graph loop bug