fix nwmatch a little