Fix after comment, stage 2