temp fix for BA name resolution issues