Fix date mapping