proper handle manual changes of counters
fix creation of clones of conditional statements