fixing stupid first date problem (once and for all?)