@@ -69,11 +69,11 @@
 #ifdef TCLTLS_SSL_USE_FASTPATH
 	/*
 	 * If the channel can be mapped back to a file descriptor, just use the file descriptor
 	 * with the SSL library since it will likely be optimized for this.
 	 */
-	parentChannel = Tls_GetParent(statePtr);
+	parentChannel = Tls_GetParent(statePtr, 0);
 	parentChannelType = Tcl_GetChannelType(parentChannel);
 
 	validParentChannelFd = 0;
 	if (strcmp(parentChannelType->typeName, "tcp") == 0) {
 		tclGetChannelHandleRet = Tcl_GetChannelHandle(parentChannel, TCL_READABLE, (ClientData) &parentChannelFdIn_p);
@@ -91,10 +91,11 @@
 	}
 
 	if (validParentChannelFd) {
 		dprintf("We found a shortcut, this channel is backed by a file descriptor: %i", parentChannelFdIn);
 		bio = BIO_new_socket(parentChannelFd, flags);
+		statePtr->flags |= TLS_TCL_FASTPATH;
 		return(bio);
 	}
 
 	dprintf("Falling back to Tcl I/O for this channel");
 #endif
@@ -110,11 +111,11 @@
 static int BioWrite(BIO *bio, CONST char *buf, int bufLen) {
 	Tcl_Channel chan;
 	int ret;
 	int tclEofChan;
 
-	chan = Tls_GetParent((State *) BIO_get_data(bio));
+	chan = Tls_GetParent((State *) BIO_get_data(bio), 0);
 
 	dprintf("[chan=%p] BioWrite(%p, <buf>, %d)", (void *)chan, (void *) bio, bufLen);
 
 	ret = Tcl_WriteRaw(chan, buf, bufLen);
 
@@ -145,11 +146,11 @@
 static int BioRead(BIO *bio, char *buf, int bufLen) {
 	Tcl_Channel chan;
 	int ret = 0;
 	int tclEofChan;
 
-	chan = Tls_GetParent((State *) BIO_get_data(bio));
+	chan = Tls_GetParent((State *) BIO_get_data(bio), 0);
 
 	dprintf("[chan=%p] BioRead(%p, <buf>, %d)", (void *) chan, (void *) bio, bufLen);
 
 	if (buf == NULL) {
 		return 0;
@@ -197,11 +198,11 @@
 
 static long BioCtrl(BIO *bio, int cmd, long num, void *ptr) {
 	Tcl_Channel chan;
 	long ret = 1;
 
-	chan = Tls_GetParent((State *) BIO_get_data(bio));
+	chan = Tls_GetParent((State *) BIO_get_data(bio), 0);
 
 	dprintf("BioCtrl(%p, 0x%x, 0x%x, %p)", (void *) bio, (unsigned int) cmd, (unsigned int) num, (void *) ptr);
 
 	switch (cmd) {
 		case BIO_CTRL_RESET: