Bug fixed comments