Fix to bootstrap of free energy surfaces, affecting timing and quantitative results

Fix to bootstrap of free energy surfaces, affecting timing and quantitative results #1154