Bug fixe attempt