Bug fix in registry