Fixed Selectors

#215 - Fixed Selectors