ExpandTimeInvariant adjusted