Added code to fix multiple requests