Working on Infinity handling.