Fix for graph view