#37 sender/receiver fix