fix misuse of HMap