Fix Registration Class