Fix multiple requests issue