Fix: change to concurrentHashMap to avoid raise condition issues