fixed issue in 2 stage selection