Attemp to fix selecting bug