fixup! Take into account several datetime type.