Fixed custom-graph 2 and 3