Fix secondary selection bug