Work around expanded ensemble issues