Fixing Custom Receiver