Fix data_list number calcuration