Fix the INFINITY problem with datasets
Apply some change