Fixed more bug in Graph