Calculation field not updating properly