CHANGE: Don't jump when after add or goto.