Finally fixed the graph