Selection Bug fixed