Fixed star comment Handling