Fixed comments issue