Fix stat_with_graph mode