LPS-31593 Fix duplicates