Trying to fix longstanding registration issue