Attempt fix to graph API