Fix the selection bug !