Fix for reoptimizing ground state.
I'm now confident that I have fixed all problems relating to previous
options