Fixed w.r.t new NSE implementation