Fixed selector bug
Merge branch 'selector-bug'