3.6/tlscontext fix