Fixed datestring issue