Fix selected issue