#JC-1363 try it fix duplicate elements