Bugfix in registry