BMA parsing fix