Working on a new version
Fix a possible number format exception
Fix a possible race condition in building list