Fixed date problem in storing them