Patched up the registration system.