bugfix boundary match