Fix for self contained bernard