fixed comments2