Fixed button de-selection