Bug fixing on metal