Fix: Registration