Made timespan.unit a bit safer