End-date fix on preview