Merge "Fix too many receivers Exception"