Fix comment model