FIX: logical error using receiver class