Fixing self registering