Fixed selectors once again