added self select bug fix