Fix issue with registration