Fix concurrency issues with finder
version