Fixed comments issue/