Solve double request issue