HardIncrement fix 2.0