additional fix up after merge