Fixing the NaN at dates in the grid (temporary fix)