Fix boot bug on evita..