Fix bug, now traverses if-else-branches also