Fix and close #84
Fix and close #85
Generate/replace labels for both loops successfully (close #85)