Fix number handling