Fixed issue with concurrent requests