The trick I use in #545 can probably be applied to the fixed temperature or fixed pressure solvers too.