A little modification against clone entries