standardize and fix Infinity issue