Performance & Fixed concurrentException(ugly fix)