Issue 68 nans