Fix issue where increment can't occur if token not found