fix for hashmap support