Potential solution for selection bug