Fixed the HasBeenSelected problem