Fixed Comment entity