fixed selection bug
fixed other selection bug