Fix Select bug on de-selection