Fix the registration order (turned out to be important)