#JC-1363 try 5 to fix duplicate elements