Attempt to fix timedelta issue