fixed multiple requests issue