fix: use non problematic hashmap fns (#853)

fix: use non problematic hashmap fns (#853) #520