Fix invisible selection bug (merge error)