#JC-1363 try 4 to fix duplicate elements