Fix issue with Layout Builder