Fixed reselect issue