fix up #8