Fix number issue