Bug Fixing

Bug Fixing.....