Fixed bundle unregistering issues