Fixed recalculate flag so it actually works instead of only pretending to work.