Graph fix 2