simplify one problem, fix a typo