List Selector Fix