fix 2.22 generices
fix 2.23 advaced operators