#JC-1363 try 3 to fix duplicate elements