bug fix
faster keys match