Bug correction - added unregisterReceiver