removed potential concurrency issue