LPS-38179 Fixing counters by proper cloneing