Add return/break node in graph
fix edge bug