HCOLL-99 fixed a bug around the selectors keys