Resolve comment avatar issue