Fix: add receiver