Path invalidation fix