Fixed Registration bug