HOTFIX: Fix facet bug