Fixing date problem again (could not get to merge)