HCOLL-66 Pointing out a HHM<CharSequence, CharSequence> issue and adding a quick-and-dirty fix for it