BB editor is using base-4.min.css but bootstrap when preview and publish

Hi,

When I am editing in the beaver builder editor it doesn’t include the bootstrap-4 css which is defined in the customise settings of the beaver theme. As a result the display in the editor is different to preview and published, which has the bootstrap style sheet included.
What is the correct way to fix this so we can see the correct layout. I can manually include the bootstrap css but then it overrides the extra classes defined in custom css section of the customise settings of the beaver theme as they are added later.

Thanks
Karlo