Fix Registration bug