Commenting bug fixed