baq fixing...