Fix: broken registration fixed