Fix NFList bug