Bug_fixes