Fixed graph creation (CL and GUI)