Fix for calculation on load.
Prep for relase 0.3.9