Reverted Selector code #215

#215