Fix date loading