Fixed waiting bug for certain servers