Should fix the selection issue