Fixed Unregister Broadcast Listener