fixed comments appearing multiple times