fix a typo in last commit
Merge branch 'in-and-nin'