Bugfix Registration