Recursive Comment fix