Fix horrible decrement bug