Added extra EFI check