Improved the broadcast receiver's behaviour