REALLY Fixed comments issue