fix for concurrent hashmap issue