Minor fix to receiver
Merge branch 'origin/master'