diff --git a/Sources/DonutKit/Git.swift b/Sources/DonutKit/Git.swift
index 316d286..291e298 100644
--- a/Sources/DonutKit/Git.swift
+++ b/Sources/DonutKit/Git.swift
@@ -63,11 +63,10 @@ public struct Git {
                         let files = Array(Set(input.components(separatedBy: "\n").dropLast()
                             .filter { $0.contains(".xctemplate") }
                             .map {
-                                $0.components(separatedBy: "/")
-                                    .filter { $0.contains(".xctemplate") }.first
+                                String($0.prefix($0.range(of: ".xctemplate")?.upperBound.encodedOffset ?? 0))
                             }
-                            .filter { $0 != nil }
-                            .map { $0! }))
+                            .filter { $0.count != 0 }
+                        ))
 
                         if files.count == 0 {
                             return SignalProducer(error: DonutError.templateFileNotFoundError)