Fixed binary select issues