Fixed select preserve issue