fixed duplicating comments