Fix for number handling