Client wrapper/send fix