Fixing the graph container