Fix invalidation