Add check that we do not reuse boundary indicator