Temp patch for SSL panel issue 2