small improvement to numeric handling