Refer #304 - Fix for SendOnly Endpoints