Fix sender MS off-by-one issue