Fix Registering before Enabled