Bug Fixing done