Don't require Selector until it's fixed