Now new optimized version is ok and tested on J2.5.16 and J3.2