Another selector tweak.
Merge pull request #957 from amit/master

Another selector tweak.