Added fix Uckelman - NS detection

Change-Id: Ibd8be81780c44407bb20abc4d0ef4ae420fe5eec