Fix for graph