Reduced the selector duplication