Fixing boot issue