Fix receiver

Change-Id: Ie7be3f55103b93cd98affa9f810249247e3524ab