Fixed the selection more