Fix multiple network request issue