Fix number bug