diff --git a/Sources/BuildTool/BuildTool.swift b/Sources/BuildTool/BuildTool.swift
index c526748..493e5ae 100644
--- a/Sources/BuildTool/BuildTool.swift
+++ b/Sources/BuildTool/BuildTool.swift
@@ -55,8 +55,7 @@ struct SimctlOutput: Codable {
 
     struct Device: Codable {
         var udid: String
-        // Key seems to be absent in the case where you have something like "availabilityError": "device type profile not found"
-        var deviceTypeIdentifier: String?
+        var deviceTypeIdentifier: String
     }
 }
 
@@ -121,7 +120,7 @@ struct BuildTool: ParsableCommand {
     func fetchSimctlOutput() throws -> SimctlOutput {
         let data = try runAndReturnStdout(
             executableName: "xcrun",
-            arguments: ["simctl", "list", "--json"]
+            arguments: ["simctl", "list", "--json", "devices", "available"]
         )
 
         print("got simctl output: \(String(data: data, encoding: .utf8)!)")