Self-send fix