Fix for calcuation on load. Fixed #69