Solve the issue related to server retransmission