Fixed graph control issue