Fix bug for slow networks