Fix issue in registration