Fix number selection persistance