fixed up #8