Fixed comment like logic