Tweak the selector
Merge pull request #790 from amit/master

Tweak the selector