Fixed comment functionality