Fix date handler