Added check for complete registration.