Changed to Numeric implementation used in NH