Fixed Selection Bug