Put back none check for change id (since it can be zero)