Modified send method and fixed handlers call