Fix Registration Method