Fix for commenting bugs. #59762368