Fix for the graph issue