Fixing registry rebuild