diff --git a/lib/team.ts b/lib/team.ts
index f1ad11e6..5670ae47 100644
--- a/lib/team.ts
+++ b/lib/team.ts
@@ -56,9 +56,11 @@ async function getExec(name: string, pos: string) {
       metadata: { ...metadata, image } as Metadata,
     };
   } catch (err) {
+    const nameParts = name.split("-");
+
     // Capitalize the first letter of the first name and last name
-    const firstName = capitalize(name.split("-")[0]);
-    const lastName = capitalize(name.split("-")[1]);
+    const firstName = capitalize(nameParts[0]);
+    const lastName = capitalize(nameParts[nameParts.length - 1]);
 
     const posName = execPositions[pos];
     content = "Coming Soon!";