Fix issue with multiple users using concurrently