Fix Date conflict