This should fix timespan not being includes in id

also needs a test