META-501 added duplicate check