Namespace and minor change in fixBMA