fixed selection issue