Fix date usage