bug Fixing