Fix possibility of Infinite ranks!