A full fix to the ranks