Fixed comment functionality.