Fix for bernard with self contained agent