[PLAT-4100] - Fix graph building bug