Fixed unwanted comment prefix in some scenarios