#130 Fix selectors