#JC-1363 try 2 ещ fix duplicate elements