SOC-4060 | Comment doesn't work