Make receiver handle dates correctly