fix up latest code