Rewiring registration events to work properly. Now fixed.