Fixed bug - Duplicate comments