Bug fix in selector