Number type handling improved