Fix another issue with a comment ending up in the wrong place