Fix merge failure in tkey fix