Fixed issue with incorrect data passed to graph