Fix bug in increment/decrement returning wrong value