fix error of last 2 commits