Fixing the registration