Fixed issue after NSS update [Tracker ID 2005]