Fix for facet number overlap