         if let query = request.queryString {
             path.append("?\(sanitize(queryString: query))")
         }
-        let traceMeta = TraceMeta(method: request.method, protocolScheme: self.passThroughBaseUrl?.scheme, host: self.passThroughBaseUrl?.host, file: path, version: "HTTP/1.1")
+        let traceMeta = TraceMeta(method: request.method, protocolScheme: self.baseUrl?.scheme, host: self.baseUrl?.host, file: path, version: "HTTP/1.1")
 
         let tracer = TraceWriter(fileURL: traceUrl)
         let token = NSUUID().uuidString

        createDefaultRouter()
    }

    public convenience init(traceUrl: URL, passThroughBaseUrl: URL? = nil) {
        self.init()
        
        self.passThroughBaseUrl = passThroughBaseUrl
        addTrace(url: traceUrl)
    }
    
    public convenience init(recordUrl: URL, passThroughBaseUrl: URL) {
        self.init()
        
        defer {
            /* Defer so that the didSet runs on recordUrl */
            self.recordUrl = recordUrl
            self.passThroughBaseUrl = passThroughBaseUrl
        }
    }
    

    
    public var port: Int?
    public var version = 0
    public var baseUrl: URL?
    public var recordUrl: URL? {
        didSet {
            if let recordUrl = recordUrl {
