fix for TLS selection

Merged armin requested to merge fixTLS into master

Merge request reports