Trying to fix concurrent requests