Os selection bug fix