Adding fix for ssid on use