HardIncrement fix 2.1