Work on 2000 end.date fix