Fixed Selection "Bug"