Hotfix for Page Builder compatibility