Fix issue with not filling in graph