bug fix && change to fb_graph