fix selection issue