ConcurrentHashMap fix