Need to deal with single-tanent as-well.