Format number fix - handle 10 digit numbers