Fix issue with graph