Trying again to fix sending issues