Calc fields shouldn't be empty after save. Issue #82