Fixed inconsistent class-selectors