Fixed handling multiple requests