Fixed BC break with facet types