Fixing send' refactor