Add date check, though tzone weirdness continues