better handle numbers