AB - fixing a merge issue