Fixing a bug when changing categories we would get a bad unit selected