Fix boot issue