need to fix sendSynchronousOneWayMessage as well