Self-Send Fix