Temp patch for SSL panel issues