Comment sweeper fix