fixed registration wait methods