fix webservice
fix concurrency issue